Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pkg/stanza] SplitFunc naming cleanup #26631

Merged

Conversation

djaglowski
Copy link
Member

Another few remaining parts of #26241. This basically follows up on renaming the multiline package by renaming a few remaining to "multiline" throughout the codebase.

@djaglowski djaglowski force-pushed the pkg-stanza-split-func-factory branch 4 times, most recently from 62ff0b2 to a4ef388 Compare September 11, 2023 22:36
@djaglowski djaglowski marked this pull request as ready for review September 11, 2023 23:06
@djaglowski djaglowski requested review from a team and mx-psi September 11, 2023 23:06
@@ -26,6 +26,6 @@ func NewCustomFactory(splitFunc bufio.SplitFunc, flushPeriod time.Duration) Fact
}

// Build builds Multiline Splitter struct
func (f *customFactory) Build() (bufio.SplitFunc, error) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comments should also be updated to SplitFunc

}
}

// Build builds Multiline Splitter struct
func (f *multilineFactory) Build() (bufio.SplitFunc, error) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

factory := NewMultilineFactory(tt.multilineCfg, tt.encoding, tt.maxLogSize, trim.Nop, tt.flushPeriod)
got, err := factory.Build()
factory := NewSplitFuncFactory(tt.splitConfig, tt.encoding, tt.maxLogSize, trim.Nop, tt.flushPeriod)
got, err := factory.SplitFunc()
if (err != nil) != tt.wantErr {
t.Errorf("Build() error = %v, wantErr %v", err, tt.wantErr)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SplitFunc() error

@djaglowski djaglowski force-pushed the pkg-stanza-split-func-factory branch from a4ef388 to 15ab4ad Compare September 12, 2023 02:48
@djaglowski
Copy link
Member Author

Thanks for the review @fatsheep9146. I've updated the comments.

@djaglowski djaglowski merged commit e8b48df into open-telemetry:main Sep 12, 2023
90 of 92 checks passed
@djaglowski djaglowski deleted the pkg-stanza-split-func-factory branch September 12, 2023 15:02
@github-actions github-actions bot added this to the next release milestone Sep 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants